Merge remote-tracking branch 'origin/DEMO_addClass'