Addresses #205, adding ability to specify the message delivery mode