same as #142
Merge pull request #143 from Evgenus/master

Fix optional 'output' argument.