#1281 Made it work for Windows.