Introduction of Text #40

Fixes issue #41 and #40