v 1.9 - improved mixin