Quick Fix
Merge pull request #160 from buddytex/master

Quick Fix
Merge pull request #161 from 5150Joker/dev

Map fixes