Changed regexes to support a wider range of values for fields

Fixes issue #13