Merge pull request #488 from hnyman/black-flash