Merge pull request #1 from triangular/devel

Devel: Fix API