PR for #896

Solves #896, using http://en.wikipedia.org/wiki/List_of_postal_codes

I knew I was missing something regarding the PRs