Merge pull request #609 from ovatsus/master

Remove duplication of stream reader creation, to make sure everything using the right encoding