removing flag
infinite loop fix
attaching evidence fixes
Merge branch 'master' into roles