Merge branch 'v2' into adding-documenation