Merge pull request #7 from dcunningham/classify

Getting Classifier working again.