Added more future improvements.
Merge branch 'master' of github.com:w3c/specberus