Heres my homework, I hope it works!
Merge pull request #21 from mattswann/master

Here's my homework, I hope it works!