Merge branch 'master' into develop
updated vignettes
Merge branch 'develop'