chmod +x
some more chmod
Merge remote-tracking branch 'origin'