Merge pull request #16 from bradbishop/master

A couple more changes for flash images.