handle username
Merge branch 'username'