Fix bug and added unit tests
Merge pull request #14 from stevenh47/stevenh47_map

Fix bug and added unit tests