Merge branch 'eduardo' into Users
Comment added directly into Users
Merge branch 'Users' into eduardo