Compatibility fix for Windows and Visual Studio 2012
Merge pull request #1 from stkirchhoff/master

Compatibility fix for Windows and Visual Studio 2012