Merge pull request #6 from Rahber/master

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

Merge pull request #6 from Rahber/master