Merge pull request #57 from johnb30/master

Proper output formatting.
Actual formatting.
Merge remote-tracking branch 'upstream/master'