Worked on traps
Merge branch 'dev' of https://github.com/remeh/soulkeeper into dev