Add city to lookup
Add postal code
Merge remote-tracking branch 'datasaur/master'