Fixes #42
Merge pull request #58 from d3athrow/Bleeding-Edge

Fixes #42