Merge pull request #5 from webgeist/new_style_classes

New style classes