Merge pull request #118 from jsmallwo/master

New class search feature