Making general modifications to Role
Merge remote-tracking branch 'origin/master'