Zip codes around the world might be longer than 5 chars
Merge branch 'develop'