Revert "Revert "Merge branch 'master' of https://github.com/jvanulde/wet-boew""

This reverts commit ccc663792485affdc99089c3c1b8aa88163d3bd7.