Added search for WX map, other minor changes.
Merge pull request #73 from mshamash/master

Added search for WX map, other minor changes.