guard mixins properly
Merge pull request #38 from aspiers/guard-mixins

guard mixins properly