First commit
Merge https://github.com/NilsHolger/matrix