Revert "Merge pull request #231 from erans/master"

This introduced some unicode issues. Reverting until resolved.

This reverts commit 8731a8d27333803a2129740605b08f351bb72196, reversing
changes made to 90157157df25f6e8707c444aa93745da38f7d372.