Replace endless recursion with proper event schedule
Merge pull request #1 from techtonik/master

Replace endless recursion with proper event schedule