WET-BOEW updates
Merge pull request #734 from sylus/master

WET-BOEW updates