Merge pull request #10 from d3athrow/Bleeding-Edge

Bleeding edge
hotfix
Merge pull request #11 from d3athrow/Bleeding-Edge

Bleeding edge
Special Sauce Changes.
Merge pull request #1181 from Heredth/dans

Dans