Started work on basic materials.
Merge remote-tracking branch 'origin/master'