Issue648

Start and End date included