Merge pull request #324 from wolfmanjm/fix/switch