Given solution for 1-2
Merge pull request #4 from PollockCR/master

Given solution for 1-2