Merge pull request #17 from budjb/development

Fix problem with message handler discovery and calling.