Fixed for windows (and 2.7)
Merge pull request #2 from gregersn/master

Fixed for windows (and 2.7)