Version 3.5

Hi!
I merged the interesting patches ...

Thanks!