Merge pull request #57 from ravishnair/webtest-improvement