Merge branch 'feature/windows_support' into develop