Changed query to work all day
Merge master