zurich location improvements
fixed regex
Merge branch 'master' into heroku