Merge pull request #229 from cholin/bug/gwcheck_jshn