Update To Mixins
Merge pull request #38 from chrishumboldt/dev-chris

Update To Mixins