gwkrsrch Merge pull request #384 from boom1492/master