Small cleanup.
Added in and output for version=2 type matrices.

 * breaks backward compatibility