Updated handling of less escaped strings (Closes #4)