Patch 1

Created by: arbabnazar

@mfaure @jkowalczyk @asqabotc3p0 @dzc34 please review the changes. I have modify the role to add those changes #43 Thanks