simpler setup
improve date sorting
Merge branch 'master' into gh-pages