Merge branch 'master' into develop
updated vignettes
Merge branch 'develop' into pre-release-0.2