Fix switch using strings
Merge pull request #480 from timrae/switchStringFix

Fix switch using strings