Use option hashes everywhere for attributes
Merge pull request #3 from boats/option-hashes

Use option hashes everywhere for attributes