Updated and merged with GeoGramOne

Updated and merged with GeoGramOne latest code