added support for single quotes