old class style changed to new style
Merge pull request #28 from ulandj/v3

old class style changed to new style