Homework 24/6/13

First ever pull request, hope it works!