Merged Scott's changes.
Merge branch 'master' of github.com:borismus/physical-web