Refactory date validation
Merge pull request #171 from Ashrey/dev

Refactory date validation