Some correction added
removed IndexableInstance
Merge branch 'matrix'
Must keep only a branch