in the city version one
Merge pull request #1 from guykap/development

in the city version one