Apply changes proposed in #29
Merge pull request #30 from w3c/dev

Apply changes proposed in #29