Added username information
Merge branch 'master' into username
Merge branch 'username'