Merge branch 'develop' into issue-19
trans logo text
Merge branch 'issue-19' into develop