Merge pull request #83 from d1b/use_new_style_classe