Fix compilation on VS2013
Merge pull request #671 from sgraham/compile-vs2013

Fix compilation on VS2013