added support for both double and single quotes