New options for intra/inter matrices patch by (Vidar Madsen <vidar at prosalg dot...