Merge output parameters
Merge pull request #272 from sroze/patch-1

Merge output parameters