execute trap earlier so that it actually works *cough*
Merge remote-tracking branch 'upstream/master' into bugfix/fix-trap
multiple traps replace each other
Merge pull request #10 from mvo5/bugfix/fix-trap

Bugfix/fix trap