Exercise 7
Merge pull request #1357 from shampto3/add-shampto3

Merging PR from @shampto3