There are some changes...

Hi.

I have been merge the changes from other forks. Do you want the pull?

Thanks.

Regards.