Merge pull request #1 from giraysam/v2

V2