w3c/dwbp — pull request #29 by newtoncalegari (2014-12-11 22:25:35+00:00)
Title: Resolving merge conflicts caused by pull #28

These commits are to resolve the merge conflicts caused by pull request #28.