Fixed 'username taken' message
Merge origin/master