Merge pull request #1 from Phirxian/master

Update Mateos81 fork from Phirxian master -> OK