Added getter/setter for switchWindows class member.
Merge remote-tracking branch 'origin/master'