Fixes for compilation errors on Visual Studio 2013
Merge pull request #239 from peastman/master

Fixes for compilation errors on Visual Studio 2013