Minor doc and messages fixes [skip ci]
Some doc code cleanup [skip ci]
Merge pull request #708 from lucianobaraglia/master

Minor doc and messages fixes [skip ci]