Updates api. Fix #57
Merge branch 'feature/api-update' into next