Feature/correct material info

I would have used a static factory method, as described here: http://css.dzone.com/articles/practical-php-refactoring-37

But it's not that important in this case.