Matrix selection fix, dependency fix
Merge pull request #130 from lev-kuznetsov/master

Matrix selection fix, dependency fix