Merge pull request #11 from CY-Chan/master

Merge pull request #7 from mattybeam/master
Clean up output
Merge pull request #8 from mattybeam/master

Clean up output