Backported fix from EK goupx
Merge pull request #10 from essentialkaos/master

Backported fix from EK goupx