fixed some permissions
Merge origin/master