#28 : better parsing for text