Take overtime into account
Merge branch 'gh6'