Fix issue #4
Merge pull request #5 from jastkand/encoding-issue

Fix issue #4