Merge pull request #73 from xboston/master

Update API and gen-stubs.php