Added username check
Merge pull request #47 from mhlas7/master

Added username check