jfkthame Merge pull request #219 from davelab6/patch-1