class updates
Merge pull request #4 from skolk/Dev-Beta

class updates