Removing more side effects
Merge branch 'master' of https://github.com/praran/CityMap