New classes are used.
Merge pull request #7 from athlan/master

New classes are used.