bugfixed/changed api
Merge branch 'development'