Merge branch 'Point-Correction' Fixes #38