Merge pull request #2 from grobie/master

Fix hours calculation
Fix holiday calculation