fixed time interpreter
Merge branch 'develop'