Use mixin technique
Merge branch 'master' into mixin

Conflicts:
	package.json
Merge pull request #3 from madebymany/mixin

Use mixin technique