added api support
Merge branch 'api'