Allowing tokenization to keep hyphenated words

Addresses Issue #12