huge (untested) refactoring
timer based trigger are now fully supported!
Merge remote-tracking branch 'origin/master'