Closes #33 (Correct handling of hyphenated words)