Merge pull request #467 from chrisngobanh/master

Updated 25.1 to include a case with a lookup that has a hyphen in the classname