Fixed
Merge pull request #723 from Heredth/Bleeding-Edge

Elvisblock Fix