Make attribute definitions consistent
Merge pull request #6 from glovell/master

Make attribute definitions consistent