Fixed permissions
Merge branch 'master' into macii