Spelling and capitalization errors
Fix merge conflict with master
Fix merge conflict with master, again
Merge pull request #42 from Surram/transfer_message

Transfer message