#81, #380
Merge pull request #413 from cjhak/docs

Updated User Guide for issues #81, #380