Merge pull request #14 from epace/master

no conflicts
fix class stuff
asdf