Fix matrix operator oveloads

Requires #72 to be merged first

Closes #70