added time measurement to calc working time for better waiting time estimations
Merge remote-tracking branch 'origin/master'