Added bare bones classes
Merge remote-tracking branch 'origin/master'
fixed setMaterial()