Fixed compilation errors on Windows
Merge pull request #341 from peastman/master

Fixed compilation errors on Windows