Fixed scripts
Merge branch 'master' into ts05