Merge "Use double for duration and time calculations"