Fix country constructor. Closes #7
Merge branch 'bugfix-#7' into develop