Fix VS2012 build
Merge pull request #131 from tribal-tec/master

Fix VS2012 build