Allow modifications of the original message
Addressed CR feedback
Merge pull request #7 from aliakb/master

Allow modifications of the original message