fixed regex to accomodate new instrument
Merge branch 'master' of github.com:drmrgd/mocha-tools