Fix Travis status
Update documentation
Merge pull request #47 from grosenbaum/update-documentation

Update documentation