Module updates

Signed-off-by: Will <sylus1984@gmail.com>
Merge pull request #914 from sylus/feature-wet-v3.1

Module updates