Updated date parsing
Merge branch 'origin/master'