several changes
Merge branch 'master' of https://github.com/Schille/wau
Merge branch 'master' of https://github.com/Schille/wau
config change