Fix #54

This changeset should fix problems with quoting described in issue #54