add fix for regex in selecting city
Merge remote-tracking branch 'origin/master'