Merge pull request #21 from akrabat/plugin-broker