Merge branch 'master' into develop
Merge branch 'master' into develop
v3 Initial refreseh
Bump version number
Merge branch 'release/v3'