Update documentation
Merge pull request #223 from grosenbaum/update-documentation

Update documentation