Refactoring, PointSearch
Fix #51
Merge remote-tracking branch 'origin/master'