Merge pull request #1 from Phirxian/master

Update Mateos81 fork from Phirxian master -> OK
Merge pull request #2 from Mateos81/master

Merge pull request #1 from Phirxian/master