Merge pull request #1 from giraysam/v2

V2
Merge pull request #2 from giraysam/master

Merge pull request #1 from giraysam/v2