fix permissions
merge master