Fix: temporally broke date calculation
Merge branch 'master' into gh-pages