Apply to improving script
Merge branch 'master' into linux