Fixes optional hyphens.
Merge pull request #4 from logista/optional-hyphen-cleanup

Fixes optional hyphens throughout the whole project.