use kwargs for messages
Merge pull request #580 from oostendo/develop

use kwargs for messages