Updated user role handling.
Merge pull request #44 from jzvelc/master

Updated user role handling.