Merge pull request #3 from chrqls/master

Update matin