#34 : Helpers %hyphens
Merge branch 'feature/34-hyphens' into version/2.2.1