normalize some country names, fix #1 and fix #2, bump version and add tests