Completed rewriting calculation of daysleft - Issue #30