Add year labels
Merge branch 'master' into reorganize