Convert old style classes to new style
Merge pull request #29 from ueg1990/new_style_classes

Convert old style classes to new style