Fix issue MR-264 - Windows 8 support