implement getter in countryCode
remove commented sourcecode
Merge remote-tracking branch 'origin/master'