Merge pull request #196 from mxk/api-ref