Fixing issue #2 - Refactor in order to replace Country and City with Region.
Merge remote-tracking branch 'origin/master'