Merge pull request

Two Script fixes / enhancements