John McCabe - 2011-05-18

Suggested changes to the two classes mentioned in the problem description.