Fixed #121, simplified quote handling logic (yay)