Imporve matgenie conversion.
Merge remote-tracking branch 'mpmaster/master'