Changes for Windows compatibility #16