Update documentation
Merge pull request #48 from hafen/dev

Update documentation