fix shell scripts
need this
Merge branch 'master' into lightweight