fixed #132 and #131 + improved disabled date validation
Merge branch 'edge' into gh-pages