Incorporates feedback from Zee about instance variables and testing.
Merge pull request #16 from tiger-swallowtails-2013/feedback_from_zee

Incorporates feedback from Zee about instance variables and testing.