Use API from 2012's style
Merge pull request #21 from othree/feature/api

Use API from 2012's style