VinewatchX 2.0 RC3

Fixes #37 and #38
hopefully this is my last commit before release