doc fixes
Merge branch 'hotfix/0.2_doc_updates'