Documentation update
Merge pull request #142 from solispauwels/master

Documentation update