Merge pull request #2 from MTG/master

Prior to Exercise 2