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

Update documentation