Merging
Maps now 'work'
Merge pull request #5 from iameric1986/master

Maps "work"