Mixin changes

- Changed the mixin calls to be more standard.
- Bumped version.
Merge pull request #27 from chrishumboldt/dev-chris

Mixin changes