Merge branch 'develop'
Created detailed text that also includes main text
Merge branch 'master' into develop