Merge pull request #22 from drobbs/master

Resolved the conflict of class names.