close #115, #120
Merge pull request #121 from YaroslavLitvinov/timer-fix

close #115, #120