Merge commit '0.3.1' into message-recipient