Merge pull request #93 from konrad-kruczynski/dispatcher_timer_fix