Merge pull request #1 from dualface/v3

V3 update