cleaned up the new package script and template
cleaned up the new package script and template
Merge remote-tracking branch 'upstream/master'