Merge pull request #18 from neonbunny/master

Fix for Issue #17 and performance changes to country flag handling