Merge pull request #1 from d3athrow/Bleeding-Edge

Bleeding edge