Fixed compilation errors on Windows, plus an error in a test case
Merge pull request #372 from peastman/master

Fixed compilation errors on Windows, plus an error in a test case