Update class implementation
Merge pull request #2 from ymyzk/class

Update class implementation