Added support for Windows 7 and Windows 2008R2.