Update my fork from medmehdi's one