Merge pull request #9 from joshiste/master

File-encoding fixes