add message generation if necessary
Merge pull request #4 from dirk-thomas/master

add message generation if necessary