Merge pull request #11 from Rahber/master

Master
Merge pull request #12 from Rahber/change-mix

Merge pull request #11 from Rahber/master