Merging metova-mandrill, closes #3