updated scaffold script
Merge branch 'develop'