Added output feature, and tweaks to previous code
fixing parameters passed in tests
Merge pull request #5 from volcra/dev

Added output feature, and tweaks to previous code