Merged initial changes for Windows functionality into a forked repository.