Split on hyphens as well as whitespace
Merge branch 'pr/98'
Build version 0.5.4