fixed script
Merge branch 'issue20'