Added documentation
Merge branch 'hotfix-3' into custom-test-case1
Re-added old test case
Merge branch 'custom-test-case1'
Revised the documentation