Updated Version conroll to look at new system
Merge remote-tracking branch 'origin/master'