Merge pull request #2 from GochoMugo/master

Short-Circuit Choose and Fix typos