Merge pull request #76 from AndrewEdwards/master

Remove multiple Version2 definition