Horrible docs fix
Merge pull request #760 from psav/docs_fix

Horrible docs fix
Cartouche is now happy
Merge pull request #761 from psav/docs_fix_the_return

Cartouche is now happy