ISSUE-22 and ISSUE-23

I've updated the spec. Please review.

-- Arthur

Received on Tuesday, 19 January 2016 19:31:18 UTC