Merge pull request #403 from runrevfraser/refactor-syntax_unicode

Fix a bug with rendering text in fields
Merge pull request #405 from runrevfraser/refactor-syntax_unicode

Fix for Cyrillic text input on OSX