hotfix comments user name
Merge branch 'develop'