Merge pull request #847 from sylus/master

Updates
Updates to WET based on Health Canada feedback.