Better description
Merge branch 'hotfix/better_description'