revert last
Fix parent's issue #210
Merge branch 'scriptsrc'