Merge pull request #2 from nickfyson/develop

Fix for UTF-8 encoding error (and some other tweaks)