Fixed bitmap (png) rendering
merge
Merge branch