fix script dir

fix script dir
Merge branch 'dev'
Merge branch 'master' of github.com:solos/timing