Move values into attributes to allow for overrides
Merge pull request #7 from MathYourLife/master

Move values into attributes to allow for overrides