First commit from VS2010
Merge https://github.com/shorepound/vs-2010-test