Merge pull request #591 from MeanwhileMedia/master

Added 'args' option to pass script args programatically
Revert "Added 'args' option to pass script args programatically"
Merge pull request #592 from Unitech/revert-591-master

Revert "Added 'args' option to pass script args programatically"
Tests fail, could be an issue with `opts.args`
Fix a conflict