close #47

+ separate time count