adjusted regular expressions
Added field types for parsing
Updated documentation and README^Cminor fix in query.