Merge pull request #784 from mcmonkey4eva/master

Pull request for code cleaning
Fix major scripting error

Previous core work left a little glitch in command parsing.