Issue #244 fixing documentation
Issue #342 fixing documentation