Including the bug for location zip
Merge remote-tracking branch 'kenneth/master'
Commit for ken.
zip code now working