Merge pull request #2 from GeoStor/master

Syncing with GeoStor