Support text-1.1

Hi Antoine, 

It would be great if you could merge and release this.

Thanks a lot!

Bas