Bitmap map fix
Merge branch 'solution_presentation'
Merge branch 'master' of https://github.com/slonka/bo