Merge pull request #1 from InfiniDev/master

Updated fork