Fix some behaviour in API
Merge commit 'a495ca6356d8c2dc521cee36f475b15abe22ea0a'
Merge branch 'master' of https://github.com/elisapp/elis