Added Cauldron support. Needs testing
 * Closes #1