better date and better checking
Merge branch 'master' into style