Merge pull request #443 from bakakaba/automatically-handle-date-query

Merge pull request #443 from bakakaba/automatically-handle-date-query #206