Add Trap.
Merge branch 'master' of github.com:mirguest/MirguestIssueReport
merge old code.