Test for branch
For the v3 branch
Merge pull request #1 from cheykoff/v3

V3 with comments