fixing variable names in bitmapworker
Merge remote-tracking branch 'origin/clean' into clean