Merge pull request #263 from smisis/v2

V2