Documentation fixes
Merge pull request #1179 from FedeOmoto/dev

Documentation fixes