Updated to support Windows 8.1