Add back m index
Merge pull request #214 from ehenneken/m_index

Add back m index