Merge pull request #46 from callapatel/callap

Callap
mandrill
Merge branch 'master' into callap