misc updates
Merge branch 'master' into devel
fix: update func on win32