Fixes #37.
Merge pull request #38 from AshFurrow/switch

@orta => Fixes #37.