fixing hours directive
Merge branch 'master' into deploy