Bug fix

Can now work with spaces and punctuation.