Code for matching points closes #17