Added Geocode test
Merge origin/master