Fixed classes
Merge pull request #1 from matsuu/fix-classes

Fixed classes