Updates for V2
Merge pull request #1 from DaveAuld/V2Update

Updates for V2