#620 - adding configurable start and end date