added more flash options, per issue #99
Merge remote-tracking branch 'upstream/master'