mixin refactor
add tests
version bump
Merge pull request #20 from HenrikJoreteg/mixin-refactor

Mixin refactor