Use more-specific class in place of 'switch' to avoid common conflicts
Merge pull request #430 from nelsonblaha/master

Use more-specific class in place of 'switch' to avoid common conflicts