Update to the new Api
Merge branch 'release/0.1'