Tyler fixed the user issues
Merge remote-tracking branch 'origin/master' into TylersBranch