code cleanup
Merge branch 'master' into BitmapTools_2013-01-29