#55 Allows multiple output types without accumulated naming changes
Merge pull request #73 from ethanmiller/master

Allows multiple output types without accumulated naming changes