Fixing 888
Help added
Merge branch 'issue-888'