Merge pull request #6 from athlan/master

Dependency updated.
New classes are used.