edit for v2
Merge pull request #1 from jozn/v2

edit for v2