Country Code and Warning on 64 Bits devices

I have taken https://github.com/bpoplauschi 's Fork and also fixed a warning on 64bit devices.