Added fix for handling encoding correctly.
Merge branch 'master' of https://github.com/jansil/ServicePlattform