Documentation fix and update Close #845