Refactorize Dates settings
Merge branch 'master' of https://github.com/m4tx/egielda