Updated from GitHub for windows