Fixed additional errors on Windows
Bug fix
Merge pull request #280 from peastman/master

Fixed additional errors on Windows