Fixed bugg with unescaped apostrophes.
Merge branch 'master' of https://github.com/zeropanic/oz