added tags to support
Merge branch 'master' of https://github.com/Schille/wau