#140 x permissions
Merge branch '#140' into staging