Implemented changes suggested by tdanford.
Merge pull request #9 from dcunningham/classify

Implemented changes suggested by tdanford.