[Issue_6] fix to correctly parse single quotes found in a double quote s...

...tring and vice versa

Please review and let me know if there are issues. Thanks!