delete whitespaces
Merge branch 'master' of github.com:fabiansch/wam
Merge branch 'master' of github.com:fabiansch/wam
solved merge conflict