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

Second part of fix for issue #9