Update Mateos81 fork from Phirxian master