Fix MatrixPram handling. Some formatting.
Merge pull request #1 from hmorch/master

Fix MatrixParam handling. Some formatting.