Added Windows 7 support