master merged with googlemaps branch and a few other minor changes