Added Matrix templates
Merge pull request #17 from msteiger/matrix_template

Added Matrix templates