I'm not sure what I did here.
Merge pull request #58 from adamroach/attributes

I'm not sure what I did here.