Update to new style classes, fix for issue #1110
Merge pull request #1117 from ehsteve/newstyle_objects

Update to new style classes, fix for issue #1110