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

Update documentation