#3 added support for date parsing