Added support for Windows 8/2012/8.1