Merge pull request #30 from bistik/matrix