configure API
Merge branch 'development'