Merge pull request #29 from tstein4/material

Material
Merge pull request #30 from tstein4/debug

Merge pull request #29 from tstein4/material