updates to scripts
Merge master of generalscripts