Update for draft11 protocol implementation
Merge pull request #65 from todesschaf/wip/draft11

Update for draft11 protocol implementation