Merge pull request #1 from dbowring/master

Pulling latest upstream changes.
Added missing Material methods.
Merge pull request #4 from thomthom/master

Notes on Materials.