Merge pull request #1 from this-that-other/master

stub
Test api
Merge pull request #1 from boiert/master

Api test stuff