Watsyn updates
Merge pull request #870 from diizy/watsyn

Watsyn updates