added sample win conf, edited README
Merge remote-tracking branch 'upstream/master'

pulling upstream changes