first commit
removed interval, added timeout instead
improved timer