windows compatible fetched pull request

pull request with initial fetch from aryeh