Merge pull request #1 from timsly/master

extract mixins into separate file
Bump version