Merge pull request #299 from Cazra/Trap2.4

It's A Trap! v2.4