Fixed compilation with Visual C++ 2013
Merge pull request #1 from pmed/master

A couple of minor fixes for Visual Studio 2013 Preview