Bug fixes
Adding JWT and Mandrill Extensions