Update features related to User
Merge pull request #350 from grosenbaum/update-features

Update features related to User