Merge pull request #67 from ororo/master

Handling ' and "