Added a check to see if class already exists before loading the class file
Merge remote-tracking branch 'origin/master'