VinewatchX 2.0 RC4

I was wrong. There was a bug.
Fixes #39