Merge branch 'hotfix/license'
Updating description
Merge branch 'hotfix/grammar' into dev