working on Hours calculation
Merge origin/master
working on Hours calculation
Merge origin/master