Added whitespace and number support.