Update documentation
CR #86
Merge pull request #86 from eile/master

Update documentation