bugfix for end_user setting
Merge pull request #1 from hongliang-goudou/develop

merge一下