Fix typos in comments
Merge pull request #2225 from fernandoacorreia/fix-typo-given

Fix typos in comments