Use username instead
Merge pull request #178 from dreamteam69/master

Use username instead