user roles
Merge branch 'issue-4'