VinewatchX 2.0 RC2

This fixes #36