Merge branch 'windows_support'