added a guard for name
Merge branch 'develop'