posts 3958 and 3960 added - some minor edits
Merge branch 'win7'