Merge "update user guide"