Add message_format option
Merge pull request #8 from vjc/add_format_option

Add message_format option