add more output types
Merge branch 'master' of https://github.com/scottkiss/gomagic