Merge pull request #5 from justinliucs/master

Merge from base project.
Class Helper updated. It can search for classes correctly.
Merge pull request #14 from lostcharlie/master

Class Helper updated.