#26 Deal with new api
Merge branch 'enhancement26' into 0.2.0-update