Added support of respecting quotes

That should fix #495