Map isziu fix
Merge branch 'master' of https://github.com/slonka/bo into map