corrections to script
corrections to template
Merge branch 'master' into g8testing