Merge pull request #57 from adamroach/attributes

Attributes
I'm not sure what I did here.