Made country label be a real current country name
Merge remote-tracking branch 'origin/master'