Added asking until sunrise/sunset. fixes #4