Text working
Merge branch 'develop'