proper doc block
Merge branch 'feature/chapter-improvements' into dev