Merge pull request #12 from torijule/master

Getting maps back up to date
Merge pull request #14 from torijule/map

Merge pull request #12 from torijule/master