Added Mandrill Compatibility
fixed merge conflicts