kozec Merge pull request #353 from neuromancer/fix-autoswitcher …