Fixes
Merge branch 'dev-api' of github.com:LitusProject/Litus into dev-api