Working map
Merge pull request #2 from amdziuk/map_search

Working map