capture all non whitespace characters, not just word characters, when parsing parameters
Merge branch master