Add Windows support
Merge branch 'feature/windows_support' into develop