experimenting with documentation styles
Merge branch 'master' into for-readthedocs