Working on #40.
Merge branch 'issue-40' of https://github.com/StephenJayYoung/CityHacker