Added dictionary citiesByCountry.
Fixed som minor bugs in order to improve robustness.