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

Update documentation