Added support for query hours
Merge branch 'feature/gh5'