Fixes #243
Fixes #244
Merge pull request #245 from ryanmcgrath/dev/add-endpoints

Add endpoints