SJM_RESET makes sjm files executable
Merge remote-tracking branch 'origin/master'