Small changes to use new style classes
Merge pull request #17 from schoolsplay/master

Small changes to use new style classes