Close GH-237: Adding flexibility with endpoints. Fixes #232