Added roles
Merge origin/master