Adds username selection option
Merge remote-tracking branch 'origin/username'