Fixed issues with todo and Duration
Merge branch 'duration-to-date-time'