Merge pull request #142 from Evgenus/master

Fix for optional 'output' argument.