added classes
Merge pull request #30 from ybk/master

added classes