Make it actually...work again...
Merge pull request #1 from Garris0n-/master

Make it actually...work again...