Fixing Encoding Issue

This push is to test a fix for an encoding issue, any other changes will
be described in the next commit.