Added Question 22 and some minor changes on Question 17
Merge pull request #8 from ileiva/master

Added Question 22 and some minor changes on Question 17