Check for invalid date format :)
Merge origin/master into Peter_T
Merge pull request #16 from tomoetom/Peter_T

Peter t