Merge pull request #16 from brint/master

Fixes for outputs