Fixed role bug.
Merge branch 'develop'