Merge pull request #259 from Useful-Innovation/johans-fixes

fixed bug with estimates total hours