Updated change of different windows settings fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #59 from Hartman2/master

Updated different windows fix
Merge pull request #25 from BlueText/master

Andrews final merge