Merge pull request #87 from blabaere/master

Adds some more doc comments