old class style changed to new style
Merge pull request #29 from ulandj/master

old class style changed to new style