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