Merge pull request #10 from tribal-tec/master

Fix clang build
Fix VS2012 build