Map change commit
Removed commented code
Merge pull request #30 from vovka/feature/Map

Map change commit