Make it work again on non-win32
Merge pull request #53 from fdelapena/master

Make it work again on non-win32