Updating my fork from SSilence's one