fixed an issue with the date parser
Merge branch 'develop'