Fixed Class array and back to normal path
Merge remote-tracking branch 'cuwo_f/master'