Merge pull request #739 from pprindeville/issue#738