Merge pull request #1 from matrix-msu/master