Added Windows 7 and 8 configurations.