Adding related messages. closes #40 and #43