Updates for class
Merge pull request #38 from zmallen/master

Updates for class