Merge branch 'pre-release-0.2'
vignette pdf
Merge branch 'master' into pre-release-0.2