capture leading # in parsing tokens #33
tweak splitter to split on commas & semicolons, closes #32