Windows update

- Updated VS2010 solution with new source.
- Small VS compatibility fix.