Second try at #285

My first attempt failed completely. Here is a second attempt to include data entry for the zip code on the initial page.
Merge pull request #1258 from shwei/patch-7

Second try at #285