split text and html parameters
Merge branch 'develop'
version