Merging kokopelli version
Merge branch 'master' of github.com:GeoDaSandbox/sandbox