Merge pull request #148 from nakengelhardt/docs_updates