Merge pull request #10 from MaxXor/master

Compatibility with VS 2010