default to PNG for BMP conversion, handle GIFs better, bump
Merge branch 'develop'