Added indentation support
Fixed time computation bug