Merge pull request #2 from GeoStor/master

Syncing with GeoStor
Merge pull request #21 from davisgis/master

Merge pull request #2 from GeoStor/master