Switched to a WhitespaceAnalyzer. Fixes #1