included some changes from other branch
small changes
further API improvements
Merge branch 'app-authn' into app