Fix for underscores in parameters

Spotted that underscores in parameters were causing a truncation of data due to them
not being included explicitly in a regular expression. Fixed that, added a test and
upped a version number so that this can be updated for vendors.