Merge pull request #55 from dizzzz/develop

CHanges for preparing replication/messaging extension