Handle numbers with no area code (eg. Hong Kong)
Merge branch 'area_code' into locomote