Add first switch option
Merge pull request #337 from bretthclarke/my-changes

Add first switch option