fixing v2-Issue
Merge pull request #8 from joker234/v2-patch

fixing v2-Issue