Fixed name/description bug
Merge branch 'dev'

* dev:
  Fixed name/description bug