change api
Merge branch 'master' of https://github.com/fhtw/koller_szuszkiewicz
Merge branch 'master' of https://github.com/fhtw/koller_szuszkiewicz