Merge pull request #370 from negativeExponent/switch