Fix for issue #16, a new tokenizer that recognizes commas and periods