fixed issues with roles  [#17 state:fixed responsible:none]
Merge remote-tracking branch 'solakaduna/master' into appo