Fixed bitmap problems
Merge remote-tracking branch 'origin/SagieBranch'