Fix to use role index not display name
Remove unnecessary underscore replace in role
Merge pull request #73 from 9seeds/master

Fix to use role index not display name