Merge pull request #713 from micmac1/sngrep1410