alex's suggestion was too long
Merge branch 'master' into gh-pages
add dates so it's more legit