Fix executable files
Merge branch 'master' into bd808