match dash as token separator as well
renaming / minor refactoring
add spec for windows style path separator