Adding attributes
Merge pull request #266 from APriestman/develop

Adding attributes
Merge remote-tracking branch 'upstream/develop' into develop