Fixes #37 -- don't ignore leading and trailing underscores and dashes