Merge branch 'feature/cleanup' into develop
Merge branch 'master' into develop
Added API section