Merge pull request #1 from GeoStor/master

Updating My Fork
Merge pull request #22 from richiepierce/master

Merge pull request #1 from GeoStor/master