Merge pull request #1 from CityGenerator/develop

Pulling in latest updates for my fork.