Merge pull request #1 from Knio/v3

V3