Refactored the adding of a a user. Note that the case of matching stopped working temporarily
Merge remote-tracking branch 'origin/master'