Merge pull request #939 from matrei/add-matrei

Merging PR from @matrei
rebuilt with @matrei added!
Added @matrei