Started to add support for Windows 7 and 2008R2