Added Windows 8.1 Support

Merging of Windows and other Quick Setups