Improved unification to deal with non-linear indices
Merge pull request #8 from jespercockx/master

Improved unification to deal with non-linear indices