adds text
Merge branch 'develop'