Added support for both Windows 8.1 and Windows Server 2012 R2.