Merge pull request #927 from nupplaphil/task/replace_getClass