Roles fix
Merge pull request #3 from zoer/fix/roles

Roles fix