Update for draft12 protocol implementation
Merge pull request #66 from todesschaf/wip/draft12

Update for draft12 protocol implementation.