further improved roleswitching
Merge branch 'master' of https://github.com/graphiclunarkid/StevenSeagull