Merge pull request #181 from matrix-msu/master

Update from Master