Fixed encoding issues

https://www.pivotaltracker.com/story/show/80322914
Merge pull request #382 from pfschwartz/develop

Fixed encoding issues