Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/dev'
Fixing issue with username.
Merge pull request #82 from ShadowSam/master

Fix : username compile error