Scripting changes
Merge pull request #1 from Bal0r/master

Scripting changes