minor roxygen changes
Merge branch 'develop' into pre-release-0.2
Merge branch 'pre-release-0.2'