Gmap

Merge Gmap into master