update code based on geopouch
0.1.0