Merge pull request #2 from d3athrow/Bleeding-Edge

Bleeding edge
PKS
Допил
Dicks
I mean Fixes