Refactored change from pull request #30. New Country Code implementation

Big thanks to @jamiely for pointing out the issue with apps not listed
in the US