cblignaut Merge pull request #47 from praekelt/feature/Change-unicode-to-str