fixes with new sad, now for testing
better?
Merge branch 'master' of github.com:bryanturley/win32