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

Fix VS2012 build