Edit of hours

Edit of hours
Merge branch 'Possible-Fix-'