script tester
some fixes
Merge branch 'develop'