Issue #24 adding time control