Merge pull request #35 from embaldridge/master

Fixes output mistake, more writing.
Merge remote-tracking branch 'upstream/master'