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

Fixed compilation errors on Windows