added switcher
Merge pull request #1568 from mollybostic/master_0904

added switcher