Fix weekday issues
Merge branch 'saucev2'