Handling ' and "

This should fix #66, while keeping changes of #62