Merge request

Hi, I'd like to merge your changes with the main version. Thanks!