city names with countries
Merge branch 'master' of https://github.com/adamof/masws