GEOWAVE-106

With changes by michael farwell.