added my name to user
added to Entity
Merge remote-tracking branch 'origin/master'
added to Entity