Merge pull request #9 from Wilfred/commas_as_whitespace

Allow commas for clarity, treating them as whitespace.
Ensure that commas in strings are preserved.
Fixing some equality bugs.
WIP. [skip ci]