Merge pull request #1 from scriptcs/master

Get changes from scriptcs origin