Changed regexes to support a wider range of values for fields

Should fix issue #13