Merge pull request #123 from kberg/custom-points