Have the map like we want
Merge pull request #4 from khattana/samosa

 Have the map like we want