input part of zephyrus cleaned
Merge branch 'master' of github.com:aeolus-project/zephyrus