Added PointInContour check
Merge branch 'temp'