Fixes #185
Extra check for fields
Fixes #186
Start of date/time format parsing