pointInShape
Merge branch '0.2.0' into pointinshape