"Finished" the API. Bugfixing pending
Merge remote-tracking branch 'origin/master'