Merge pull request #8 from mattybeam/master

Clean up output
Merge pull request #9 from mattybeam/master

Fix estimation bug
Merge pull request #12 from CY-Chan/master

Bring up to date