Merge pull request #1375 from ripieces/master

Visual C++ 2010 Express support