#closes 18
Merge pull request #20 from mikedao/adding_classes

#closes 18