Merge pull request #15 from Rahber/change-mix

Speeding up mater branch.
Merge pull request #16 from Rahber/change-mix

db
Merge pull request #17 from Rahber/master

Master