Windows build fix.
Merge pull request #116 from thedax/master

Windows build fix.