Gh 959

tested locally and ran regression tests.  ready for merge.