Update the mixins
Merge pull request #40 from raphaelfabeni/develop

Update the mixins