Better implement of date parser. fixes #67