preparing for FPWD
Merge pull request #101 from w3c/FPWD

Merging to allow Artb to review it now.