Implementing $timeout and $interval
Merge branch 'topic/timeout-interval'