Added time differentiation
merge commit