Making country name and code required. Fixes #34