Merge pull request #3 from akamai-tech/master

Update to draft-13