Update with more VS2012/2010 changes.
Merge pull request #104 from XenonofArcticus/patch-2

Update with more VS2012/2010 changes.