Adding attributes
Merge pull request #266 from APriestman/develop

Adding attributes