Merge branch 'issue#9' into develop
Fix directory role