Improved readability
Added fields for location(Country, City)
Merge branch 'master' of git@github.com:Zackeree/Group320.git