0.4.5: Merge pull request for output encoding

Closes #82
Merge remote-tracking branch 'upstream/master'