Fixes issue #30

- fixes splitting single-quoted strings
- fixes joining single-quoted strings