Fix bug and add feature

Add chronometer feature.