Updated name and description
Merge branch 'develop' into staging