fixed minor bug
Merge branch 'master' of github.com:Oted/BMAP
improved codestructure, warning for big commit lol