DB
Merge pull request #3 from Rahber/master

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

DB