Fix missing includes and class MaterialMerger
Merge pull request #24 from jtorresfabra/fix_wincompilation

Fix missing includes and class MaterialMerger