Updated User Guide for issues #81, #380

Updated User Guide.