Correctly pull output filename from arguments, not context
Remove trailing whitespace
Merge pull request #1 from peterjosling/feature/multiple-file-fix

Fix outputting multiple files