Doc Fixes
Merge pull request #630 from lucianobaraglia/master

Doc Fixes