Clean date picker
Fix
Merge pull request #191 from PonteIneptique/issue-188-squash

Issue 188 squash