documentation tweaking
Merge branch 'dev'