Hopefully fixed the last of the API issues. Fixes #40
Merge remote-tracking branch 'origin/17' into 17