Gh 1138

tested locally and with gh-1138 branch.  looks good.