Updating the doc.
Code refactoring and new message option.
Merge pull request #6 from jeroen/master

Code refactoring and new message option.