geoshape 2.x branch and changes