date tag testing!
Merge branch 'master' into sem_fricci