Adding two classes (forgot to push earlier)
Merge pull request #5 from iceycode/branch1

Adding two classes (forgot to push earlier).