Improve documentation comments
Merge branch '#8' into 0.0.x - for some work