Merge pull request #629 from leider/master

Converting statusmessage to a function object
Merge commit '13568c9d7bf508a2cc8ac0a64429ee9a6b24c998'