manage classes
Merge pull request #18 from mattinm/master

manage classes