Merge pull request #19 from d3athrow/Bleeding-Edge

Bleeding edge
Fix
Merge pull request #1080 from Heredth/Bleeding-Edge

Fart Hotfix