Version 2.1

Added optional use of VPrediction, some fixes and tweaking.