Merge pull request #14 from szkiba/13-adapt-to-protocol-changes

Merge pull request #14 from szkiba/13-adapt-to-protocol-changes #35