Added sensible defaults for dates
Merge branch 'dev'