Support for hourly granularity - need some testing

Tests seems to pass but not sure it does work 100%.

more testing welcome!