MAP FIX
Merge pull request #80 from skull132/master

MAP FIX
Merge pull request #5 from Aurorastation/master

Branch Update 30APR14