Return Matrix&
Merge remote-tracking branch 'origin/tianyi2' into luhui