Added MATE support
Merge pull request #1 from Exalm/master

Added MATE support