MAP E_FIX

Because DM is dumb
Merge pull request #75 from skull132/master

MAP E_FIX
Merge pull request #76 from Aurorastation/development

MAP E_FIX