Fix for map
Merge pull request #10 from mlcrazy/mapindex

Fix for map