fixed city()
Merge branch 'master' of https://github.com/jwhite007/Mashup