changed to material names, fixes some tiny bugs
Merge pull request #3 from danielhobby/experimental

changed to material names, fixes some tiny bugs