V2

accept pull request to merge v2 branch into master