Fixes for Visual Studio 2013
Merge pull request #175 from dalkon/master

Fixes for Visual Studio 2013