Allow additional outputs
Merge pull request #92 from rkoster/Additional-outputs

Allow additional outputs
Merge branch 'develop' into experiment-mt