added api [#7]
Merge branch 'api' into develop