Updated style
Merge branch 'workspace' of github.com:fragsalat/wbb into workspace