New test script
Merge branch 'improve-script'