Bring code in to line with coding guidelines and correct bugs
2 more country codes detected. Changed according to http://www.worldatlas.com/aatlas/ctycodes.htm
Merge pull request #314 from timschofield/develop

Develop