-- applied patches and made some modifications
Merge pull request #57 from ravishnair/webtest-improvement

-- applied patches and made some modifications