Merge cauldron164 and cauldron172 into cauldron.

The different versions are put into different channels
Merge pull request #20 from totokaka/patch-1

Merge cauldron164 and cauldron172 into cauldron.