Allow for running of more complex tasks with arguments
Merge remote-tracking branch 'origin/master'