Update to support windows and windows cross compilation