Merge pull request #1 from Materix/master

Marge