Made the code compatible with Visual Studio 2010
Merge branch 'master' of git://github.com/bkaradzic/bx