Merge pull request #223 from colemanw/webtest2