Minor refactoring
Rolling  back
Merge branch 'master' of github.com:fantactuka/role