Merge pull request #1185 from MusicMonkey5555/script-improvements