use new api interface
Merge branch 'issue-24' into develop