Fixed AttributeError: 'dict' object has no attribute 'name' error
Merge pull request #699 from echel0n/master

Sync master<->dev
Merge pull request #700 from echel0n/dev

Sync master<->dev