Added single quotes and minor fixes as per Issue #1